diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index 3b7dcc6..af85e65 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -23,7 +23,7 @@
 		$this->CI =& get_instance();
 
 		// load the requested js library
-		$this->CI->load->library($js_library_driver, array('autoload' => $autoload));
+		$this->CI->load->library('javsacript/'.$js_library_driver, array('autoload' => $autoload));
 		// make js to refer to current library
 		$this->js =& $this->CI->$js_library_driver;
 		
diff --git a/system/libraries/Jquery.php b/system/libraries/javascript/Jquery.php
similarity index 99%
rename from system/libraries/Jquery.php
rename to system/libraries/javascript/Jquery.php
index c63a742..f6b8dce 100644
--- a/system/libraries/Jquery.php
+++ b/system/libraries/javascript/Jquery.php
@@ -24,7 +24,7 @@
  * @link		http://www.codeigniter.com/user_guide/libraries/jquery.html
  */
  
-class Jquery extends CI_Javascript {
+class CI_Jquery extends CI_Javascript {
 
 	var $_javascript_folder = 'js';
 	var $jquery_code_for_load = array();